feat: wire ClaimsService and ClaimsController initialization by tuna1207 · Pull Request #9588 · MetaMask/core

tuna1207 · 2026-07-22T08:10:10Z

Explanation

Adds ClaimsService and ClaimsController as default initialized units in the @metamask/wallet package, following the existing InitializationConfiguration pattern used by TransactionController, StorageService, and other wallet instances.

@metamask/wallet is the shared controller-integration layer for extension, mobile, and other clients, so build-specific and runtime values are injected via instanceOptions rather than hardcoded.

ClaimsService — selects the Claims API environment and platform fetch implementation. instanceOptions.claimsService.env and instanceOptions.claimsService.fetchFunction are required. The wallet init delegates AuthenticationController:getBearerToken to the service messenger; hosts must register AuthenticationController on the supplied root messenger before authenticated Claims API calls succeed.

ClaimsController — stateful controller with no additional constructor options beyond optional persisted state. The wallet init delegates only the ClaimsService actions the controller calls (fetchClaimsConfigurations, getRequestHeaders, getClaimsApiUrl, generateMessageForClaimSignature, getClaims) plus KeyringController:signPersonalMessage.

Wallet release work is intentionally deferred; this PR lands the integration and documents consumer options only.

References

Per-environment options

Option	Extension	Mobile	Default (Node / tests / wallet-cli)
`claimsService.env`	Build flavor (`Env.DEV` / `Env.UAT` / `Env.PRD`)	Build flavor (`Env.DEV` / `Env.UAT` / `Env.PRD`)	`Env.PRD` in wallet-cli; `Env.DEV` in wallet unit tests
`claimsService.fetchFunction`	Platform `fetch`	Platform `fetch`	`globalThis.fetch`
`claimsController` state	Persisted via wallet `state` blob when supplied	Persisted via wallet `state` blob when supplied	Optional; defaults apply when omitted
`AuthenticationController:getBearerToken`	Host must register `AuthenticationController` on the wallet root messenger (not an `instanceOptions` slot)	Host must register `AuthenticationController` on the wallet root messenger (not an `instanceOptions` slot)	Not wired in wallet-cli; authenticated Claims calls require host auth wiring

Verification

yarn workspace @metamask/wallet run test
yarn workspace @metamask/wallet run jest --no-coverage src/initialization/instances/claims-service/claims-service.test.ts src/initialization/instances/claims-controller/claims-controller.test.ts
yarn workspace @metamask/wallet run messenger-action-types:check
yarn workspace @metamask/wallet run lint:tsconfigs
yarn workspace @metamask/wallet-cli run lint:tsconfigs
yarn readme-content:check
yarn codeowners:check
yarn lint:teams

Checklist

I've updated the test suite for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed
I've introduced breaking changes in this PR and documented required consumer options in the table above
Wallet release deferred to a follow-up request

Made with Cursor

Add default wallet initialization units for ClaimsService and ClaimsController with tight messenger delegation, required claimsService instance options, wallet-cli defaults, ownership, and dependency graph updates. Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

Colocate ClaimsService with ClaimsController so a single CODEOWNERS initializationPath covers both units, and revert multi-path ownership. Co-authored-by: Cursor <cursoragent@cursor.com>

Match the SubscriptionEnv naming pattern so wallet consumers can set claimsService.env without colliding with other Env enums. Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

lwin-kyaw · 2026-07-23T02:30:52Z

      storage: new InMemoryStorageAdapter(),
    },
    remoteFeatureFlagController: REMOTE_FEATURE_FLAG_OPTIONS,
+    claimsService: {


Why? TransactionController doesn't interact with claims though.

similar to #9588 (comment)

Is this really required for the test file only, since no change has been made to the corresponding controller initialization file? If not, please remove

lwin-kyaw · 2026-07-23T02:34:04Z

 export type InstanceSpecificOptions = {
  approvalController?: ApprovalControllerInstanceOptions;
+  claimsService: ClaimsServiceInstanceOptions;
+  claimsController?: ClaimsControllerInstanceOptions;


May I know why is claimsController optional but claimsService is required?

The controller only needs state and messenger, which initialization already provides. There's nothing for the consumer to configure, so the slot is optional.
Claim Service need required fetchFunction option

lwin-kyaw · 2026-07-23T03:35:55Z

One more thing I noticed is that shield/subscriptions/claims controllers have the different constructor interfaces.

Some accept ENV and some accept URL. I think they should be consistent.
And what's your thought on replacing ClaimsEnv SubscriptionsEnv with ENV from the AuthenticationController?

pedronfigueiredo

I see there's a bunch of comments and merge conflicts, can you address them and then re-request my review here on github once it's ready for another look?

…eConfig types

tuna1207 · 2026-07-30T13:22:50Z

One more thing I noticed is that shield/subscriptions/claims controllers have the different constructor interfaces.

Some accept ENV and some accept URL. I think they should be consistent. And what's your thought on replacing ClaimsEnv SubscriptionsEnv with ENV from the AuthenticationController?

Env is a generic infra concept, not an auth concept. Making claims/subscription/shield depend on profile-sync for a 3-value enum couples unrelated packages - every profile-sync major bump (it's at v28, moves fast) forces churn in dependents. claims/subscription currently only use it type-only; adding a runtime import makes it a real dependency.

I think we can move Env into a neutral shared package - @metamask/controller-utils is the natural home since everyone already depends on it. Then profile-sync, claims, subscription, geolocation, money-account, sentinel all import from there. Each package keeps its own service URL map.

mcmire

Nice work, I just have one comment.

mcmire · 2026-07-30T18:45:09Z

+  init: ({ messenger, options }) =>
+    new ClaimsService({
+      messenger,
+      env: options.env ?? Env.PRD,


Is this safe, do we want this to be development by default instead? I don't know what convention we've been using for other services, but it seems like we wouldn't want to hit production unnecessarily.

Alternatively should we make this option required and have clients always pass this?

This one follow other controllers like profile sync authentication controller, money account api service all default to prd, since for all services with auth we need to follow authentication controller i think we can keep this for now and refactor all controllers to default to dev in the future if needed

cursor

Cursor Bugbot has reviewed your changes and found 2 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 063e097. Configure here.}

tuna1207 · 2026-08-02T08:12:16Z

@mcmire @pedronfigueiredo i have refactored claim service to its own separate data service and resolve all the comments, please help me review again, thank you

tuna1207 and others added 10 commits July 22, 2026 15:09

docs(wallet): add Claims initialization changelog entry

4285b44

Co-authored-by: Cursor <cursoragent@cursor.com>

refactor: claim controller export env

be1ebc7

Merge branch 'main' into feat/claim-controller-mm-wallet

8be9983

refactor(wallet): nest ClaimsService under claims-controller init

84750e0

Colocate ClaimsService with ClaimsController so a single CODEOWNERS initializationPath covers both units, and revert multi-path ownership. Co-authored-by: Cursor <cursoragent@cursor.com>

refactor(wallet): re-export claims Env as ClaimsEnv

7dc5df2

Match the SubscriptionEnv naming pattern so wallet consumers can set claimsService.env without colliding with other Env enums. Co-authored-by: Cursor <cursoragent@cursor.com>

docs(wallet-cli): note claimsService instance options wiring

19de465

Co-authored-by: Cursor <cursoragent@cursor.com>

fix: lint

8a31a85

Merge branch 'main' into feat/claim-controller-mm-wallet

0efe75a

fix: changelog

4446ad5

tuna1207 marked this pull request as ready for review July 23, 2026 00:58

tuna1207 requested review from a team as code owners July 23, 2026 00:58

tuna1207 temporarily deployed to default-branch July 23, 2026 00:58 — with GitHub Actions Inactive

tuna1207 requested review from chaitanyapotti, lwin-kyaw and tanguyenvn July 23, 2026 00:59

fix: lint

745fd37

tuna1207 changed the title ~~feat(wallet): wire ClaimsService and ClaimsController initialization~~ feat: wire ClaimsService and ClaimsController initialization Jul 23, 2026

lwin-kyaw reviewed Jul 23, 2026

View reviewed changes

matthewwalsh0 requested a review from pedronfigueiredo July 23, 2026 09:05

chaitanyapotti added the team-shield label Jul 24, 2026

tuna1207 added the team-subscriptions label Jul 24, 2026

pedronfigueiredo requested changes Jul 28, 2026

View reviewed changes

tuna1207 added 3 commits July 29, 2026 16:48

Merge branch 'main' into feat/claim-controller-mm-wallet

17bf62a

Merge branch 'main' into feat/claim-controller-mm-wallet

588cda9

refactor(claims-controller): update ClaimsService environment handling

458c94b

cursor Bot reviewed Jul 30, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/claims-service/claims-service.ts

Comment thread packages/wallet-cli/src/daemon/wallet-factory.ts Outdated

tuna1207 added 3 commits July 30, 2026 18:29

chore: update changelog

a93ecdb

fix: remove unneeded import

022dd84

feat(claims-controller): add ClaimsControllerOptions and ClaimsServic…

e799716

…eConfig types

tuna1207 requested a review from a team as a code owner July 30, 2026 13:06

chore: update changelog

6af6ff4

tuna1207 requested a review from pedronfigueiredo July 30, 2026 14:16

pedronfigueiredo requested changes Jul 30, 2026

View reviewed changes

mcmire reviewed Jul 30, 2026

View reviewed changes

tuna1207 added 2 commits August 1, 2026 22:54

Merge branch 'main' into feat/claim-controller-mm-wallet

9edc0c4

feat: enhance Claims Service Integration

063e097

cursor Bot reviewed Aug 2, 2026

View reviewed changes

Comment thread packages/claims-controller/src/ClaimsService.ts Outdated

Comment thread packages/claims-controller/src/ClaimsService.ts Outdated

tuna1207 added 3 commits August 2, 2026 14:57

fix: lint

99dba27

feat: enhance ClaimsService with bearer token handling and caching logic

5f5394d

test: add handling for malformed GET responses in ClaimsService tests

c0be717

tuna1207 requested review from mcmire and pedronfigueiredo August 2, 2026 08:12

Uh oh!

Uh oh!

Conversation

tuna1207 commented Jul 22, 2026

Explanation

References

Per-environment options

Verification

Checklist

Uh oh!

Uh oh!

Uh oh!

lwin-kyaw Jul 23, 2026

Choose a reason for hiding this comment

Uh oh!

tuna1207 Jul 30, 2026

Choose a reason for hiding this comment

Uh oh!

pedronfigueiredo Jul 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lwin-kyaw Jul 23, 2026

Choose a reason for hiding this comment

Uh oh!

tuna1207 Jul 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lwin-kyaw commented Jul 23, 2026

Uh oh!

pedronfigueiredo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

tuna1207 commented Jul 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mcmire left a comment

Choose a reason for hiding this comment

Uh oh!

mcmire Jul 30, 2026

Choose a reason for hiding this comment

Uh oh!

tuna1207 Aug 2, 2026

Choose a reason for hiding this comment

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

tuna1207 commented Aug 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

tuna1207 commented Jul 30, 2026 •

edited

Loading